Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / gui / .DS_Store

diff --git a/ruralHouses client/src/gui/.DS_Store b/ruralHouses client/src/gui/.DS_Store
new file mode 100644 (file)
index 0000000..5008ddf
Binary files /dev/null and b/ruralHouses client/src/gui/.DS_Store differ